From 77be14d4469496213616386054d715283596c4d4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?IOhannes=20m=20zm=C3=B6lnig?= Date: Fri, 8 Apr 2016 22:46:37 +0200 Subject: [PATCH] Introjucer has been renamed to Projucer --- debian/{Introjucer.desktop => Projucer.desktop} | 4 ++-- debian/README.Debian | 14 +++++++------- debian/control | 6 +++--- debian/introjucer.install | 4 ++-- debian/introjucer.mime | 2 +- debian/libbuilder/AppConfig.h | 2 +- debian/libbuilder/Makefile | 2 +- debian/rules | 8 ++++---- .../{Introjucer-help2man => Projucer-help2man} | 10 +++++----- 9 files changed, 26 insertions(+), 26 deletions(-) rename debian/{Introjucer.desktop => Projucer.desktop} (83%) rename debian/scripts/{Introjucer-help2man => Projucer-help2man} (69%) diff --git a/debian/Introjucer.desktop b/debian/Projucer.desktop similarity index 83% rename from debian/Introjucer.desktop rename to debian/Projucer.desktop index b34c3612..a6bd8e7f 100644 --- a/debian/Introjucer.desktop +++ b/debian/Projucer.desktop @@ -1,9 +1,9 @@ [Desktop Entry] Version=1.0 -Name=Introjucer +Name=Projucer GenericName=JUCE project management tool Comment=IDE for working with JUCE based projects -Exec=/usr/bin/Introjucer %f +Exec=/usr/bin/Projucer %f Icon=juce.png Categories=Development MimeType=applications/x-juce; diff --git a/debian/README.Debian b/debian/README.Debian index 8b7f0b9a..5a76dcf3 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -3,7 +3,7 @@ JUCE for Debian upstream's preferred form of usage of JUCE is to include a verbatim copy of all used JUCE modules in your appication. -This is made explicit in the 'Introjucer', JUCE's own software project +This is made explicit in the 'Projucer', JUCE's own software project management workbench, that will copy (or symlink, or include otherwise) the modules' source code into your project. @@ -22,16 +22,16 @@ portability of their projects. [1] https://wiki.debian.org/StaticLinking -# Introjucer for Debian +# Projucer for Debian If you are developing your own JUCE application, you are of course free to follow upstream's advice. -Installing the following packages will give you the 'Introjucer' as Debian +Installing the following packages will give you the 'Projucer' as Debian packages while keeping your embedded-module-code workflow: - - introjucer (contains the Introjucer) + - introjucer (contains the Projucer) - juce-modules-source (contains the source-code for the JUCE modules) -The 'Introjucer' as shipped with Debian has the following modification regarding +The 'Projucer' as shipped with Debian has the following modification regarding the once shipped by upstream: - The generated project Makefile will honour external *FLAGS (e.g. CXXFLAGS) by @@ -44,7 +44,7 @@ the once shipped by upstream: $ make V=1 -- The Introjucer *itself* is linked against libjuce, rather than including the +- The Projucer *itself* is linked against libjuce, rather than including the modules statically. (Though you will hopefully never notice a difference here) @@ -75,7 +75,7 @@ I usually prefix these flags with JUCE_ (e.g. "CPPFLAGS" becomes "JUCE_CPPFLAGS") and then append the external flag ("$(CPPFLAGS)") to these. You could recreate the Makefiles by running the project's .jucer file through -Debian's "Introjucer" (the so-generated Makefiles allow both overriding of +Debian's "Projucer" (the so-generated Makefiles allow both overriding of *FLAGS and building verbosely), but adding 'introjucer' to the Build-Depends is probably an overkill. diff --git a/debian/control b/debian/control index 0b5bf061..5fd7782f 100644 --- a/debian/control +++ b/debian/control @@ -85,9 +85,9 @@ Recommends: juce-modules-source Description: JUCE's project management tool JUCE (Jules' Utility Class Extensions) is an all-encompassing C++ framework for developing cross-platform software. - The Introjucer is JUCE's project-management tool and secret weapon. + The Projucer (formerly Introjucer) is JUCE's project-management tool and secret weapon. . - The Introjucer's Duties: + The Projucer's Duties: - Central management of cross-platform builds - JUCE Module Management - New Project Creation @@ -108,4 +108,4 @@ Description: Jules' Utility Class Extensions (module sources) GUIs, and for handling graphics and sound. . This package provides the sources for the JUCE modules, as used by 'jucer' - projects. (Introjucer is provided in the 'introjucer' package). + projects. (Projucer is provided in the 'introjucer' package). diff --git a/debian/introjucer.install b/debian/introjucer.install index 3beca360..2f1da2bd 100644 --- a/debian/introjucer.install +++ b/debian/introjucer.install @@ -1,3 +1,3 @@ -extras/Introjucer/Builds/Linux/build/Introjucer usr/bin +extras/Projucer/Builds/Linux/build/Projucer usr/bin debian/libbuilder/build/juce.png usr/share/pixmaps/ -debian/Introjucer.desktop usr/share/applications/ +debian/Projucer.desktop usr/share/applications/ diff --git a/debian/introjucer.mime b/debian/introjucer.mime index ef0da3ed..643f3da6 100644 --- a/debian/introjucer.mime +++ b/debian/introjucer.mime @@ -1 +1 @@ -application/x-juce; Introjucer '%s'; edit=Introjucer '%s'; test=test "$DISPLAY" != ""; priority=2 +application/x-juce; Projucer '%s'; edit=Projucer '%s'; test=test "$DISPLAY" != ""; priority=2 diff --git a/debian/libbuilder/AppConfig.h b/debian/libbuilder/AppConfig.h index c5f1252a..6dd2eff3 100644 --- a/debian/libbuilder/AppConfig.h +++ b/debian/libbuilder/AppConfig.h @@ -5,7 +5,7 @@ // [BEGIN_USER_CODE_SECTION] #include "libjuce_builddate.h" -// (You can add your own code in this section, and the Introjucer will not overwrite it) +// (You can add your own code in this section, and the Projucer will not overwrite it) // [END_USER_CODE_SECTION] diff --git a/debian/libbuilder/Makefile b/debian/libbuilder/Makefile index 4c8fe5b5..528064d8 100644 --- a/debian/libbuilder/Makefile +++ b/debian/libbuilder/Makefile @@ -14,7 +14,7 @@ empty= JUCE_PATH=../.. MODULES_PATH=$(JUCE_PATH)/modules DEMO_PATH = $(JUCE_PATH)/examples/Demo/Builds/Linux/ -INTROJUCER_PATH = $(JUCE_PATH)/extras/Introjucer/Builds/Linux/ +INTROJUCER_PATH = $(JUCE_PATH)/extras/Projucer/Builds/LinuxMakefile/ SOURCES=juce_audio_basics.cpp \ juce_audio_devices.cpp \ diff --git a/debian/rules b/debian/rules index 9fdafa3d..ea431926 100755 --- a/debian/rules +++ b/debian/rules @@ -23,7 +23,7 @@ DEB_COPYRIGHT_CHECK_IGNORE_REGEX = \ DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(cdbs_make_curdestdir) prefix=/usr libdir=/usr/lib/${DEB_HOST_MULTIARCH}/ -DEB_INSTALL_MANPAGES_introjucer=$(BUILDDIR)/Introjucer.1 +DEB_INSTALL_MANPAGES_introjucer=$(BUILDDIR)/Projucer.1 DEB_INSTALL_CHANGELOGS_ALL=ChangeList.txt pre-build:: patch @@ -38,8 +38,8 @@ pre-build:: patch common-binary-arch:: $(DEB_INSTALL_MANPAGES_introjucer) -$(BUILDDIR)/Introjucer.1: - help2man -N --version-string="Introjucer $(DEB_UPSTREAM_VERSION)" -n "the JUCE project-management tool" debian/scripts/Introjucer-help2man > $@ +$(BUILDDIR)/Projucer.1: + help2man -N --version-string="Projucer $(DEB_UPSTREAM_VERSION)" -n "the JUCE project-management tool" debian/scripts/Projucer-help2man > $@ build/libjuce-doc:: cd doxygen && doxygen Doxyfile @@ -57,7 +57,7 @@ binary-post-install/juce-modules-source:: clean:: unpatch rm -rf doxygen/doc - rm -rf extras/Introjucer/Builds/Linux/build + rm -rf extras/Projucer/Builds/LinuxMakefile/build rm -f $(BUILDDATE_HEADER) make -C debian/extra/lv2-ttl-generator/ clean diff --git a/debian/scripts/Introjucer-help2man b/debian/scripts/Projucer-help2man similarity index 69% rename from debian/scripts/Introjucer-help2man rename to debian/scripts/Projucer-help2man index 36cbe5f2..cfce4395 100755 --- a/debian/scripts/Introjucer-help2man +++ b/debian/scripts/Projucer-help2man @@ -1,5 +1,5 @@ #!/bin/sh -INTROJUCER=$(pwd)/extras/Introjucer/Builds/Linux/build/Introjucer +INTROJUCER=$(pwd)/extras/Projucer/Builds/Linux/build/Projucer LIBJUCE_PATH=$(pwd)/debian/libbuilder/build if [ -d "${LIBJUCE_PATH}" ]; then @@ -7,15 +7,15 @@ if [ -d "${LIBJUCE_PATH}" ]; then export LD_LIBRARY_PATH fi -#INTROJUCER=Introjucer +#INTROJUCER=Projucer case "$1" in -h|--help) - #${INTROJUCER} -h 2>/dev/null | sed -e 's|^ Introjucer --| --|' + #${INTROJUCER} -h 2>/dev/null | sed -e 's|^ Projucer --| --|' cat <